(choose-completion-string): Use plain exit-minibuffer,

not minibuffer-complete-and-exit.  And do so only if the minibuffer
was doing completion.

diff --git a/lisp/simple.el b/lisp/simple.el
index 02e8f8cef263c03e967a72d23aed71ce4a772a94..1adcb212151654940a13a60d945a53c23792ef6a 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2548,7 +2548,8 @@ it were the arg to `interactive' (which see) to interactively read the value."
        (set-window-point window (point)))
       ;; If completing for the minibuffer, exit it with this choice.
       (and (equal buffer (window-buffer (minibuffer-window)))
-          (minibuffer-complete-and-exit)))))
+          minibuffer-completion-table
+          (exit-minibuffer)))))
 
 (defun completion-list-mode ()
   "Major mode for buffers showing lists of possible completions.